From ea1248436a8ebe048ac70c5967a6904d4c78073d Mon Sep 17 00:00:00 2001 From: Alastair Tse Date: Fri, 1 Dec 2006 13:55:28 +0000 Subject: [PATCH] [XEND] Reapply fix for ever expanding kernel_args in XendConfig Signed-off-by: Alastair Tse --- tools/python/xen/xend/XendConfig.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/python/xen/xend/XendConfig.py b/tools/python/xen/xend/XendConfig.py index 8cec14ba0e..375ba473a4 100644 --- a/tools/python/xen/xend/XendConfig.py +++ b/tools/python/xen/xend/XendConfig.py @@ -554,7 +554,7 @@ class XendConfig(dict): # attempt to extract extra arguments from SXP config arg_ip = sxp.child_value(image_sxp, 'ip') - if arg_ip and not re.search(r'ip=[0-9\.]+', kernel_args): + if arg_ip and not re.search(r'ip=[^ ]+', kernel_args): kernel_args += ' ip=%s' % arg_ip arg_root = sxp.child_value(image_sxp, 'root') if arg_root and not re.search(r'root=[^ ]+', kernel_args): @@ -1019,7 +1019,7 @@ class XendConfig(dict): # attempt to extract extra arguments from SXP config arg_ip = sxp.child_value(image_sxp, 'ip') - if arg_ip and not re.search(r'ip=[0-9\.]', kernel_args): + if arg_ip and not re.search(r'ip=[^ ]+', kernel_args): kernel_args += ' ip=%s' % arg_ip arg_root = sxp.child_value(image_sxp, 'root') if arg_root and not re.search(r'root=', kernel_args): -- 2.30.2